From 744703ccb705f268c6e1e924b1fa3d2b13adba61 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 5 Mar 2007 15:04:28 +0000 Subject: [PATCH] linux/x86_64 2.6.18: remove orig_ist orig_ist is bound to presence of a TSS, hence is meaningless on Xen kernels. Signed-off-by: Jan Beulich --- linux-2.6-xen-sparse/arch/x86_64/kernel/init_task.c | 2 +- .../include/asm-x86_64/mach-xen/asm/processor.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/init_task.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/init_task.c index 86bc43b046..e0bd1e50e7 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/init_task.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/init_task.c @@ -47,11 +47,11 @@ EXPORT_SYMBOL(init_task); * on exact cacheline boundaries, to eliminate cacheline ping-pong. */ DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS; -#endif /* Copies of the original ist values from the tss are only accessed during * debugging, no special alignment required. */ DEFINE_PER_CPU(struct orig_ist, orig_ist); +#endif #define ALIGN_TO_4K __attribute__((section(".data.init_task"))) diff --git a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/processor.h b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/processor.h index 2ca8c14faf..794efcbcd9 100644 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/processor.h +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/processor.h @@ -246,11 +246,13 @@ DECLARE_PER_CPU(struct tss_struct,init_tss); extern struct cpuinfo_x86 boot_cpu_data; +#ifndef CONFIG_X86_NO_TSS /* Save the original ist values for checking stack pointers during debugging */ struct orig_ist { unsigned long ist[7]; }; DECLARE_PER_CPU(struct orig_ist, orig_ist); +#endif #ifdef CONFIG_X86_VSMP #define ARCH_MIN_TASKALIGN (1 << INTERNODE_CACHE_SHIFT) -- 2.30.2